Fix check for modifiers.

Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
        modifiers.

diff --git a/ChangeLog b/ChangeLog
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6232eafcafa8bc01f015492ce19318f4e211f249..047ae293021fbd9e22e33f624abab30aeea46f66 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
+       modifiers.
+
 2001-12-12  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index d38da289628c3c5f63e06408e99634cc96bf6da7..ee143de36c0ffd4aaa402a3976387681813a9809 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -382,7 +382,8 @@ window_key_press_handler (GtkWidget   *widget,
        * AccelGroup changes etc.
        */
       if (event->keyval == keyval &&
-          (mods & event->state) == mods)
+          ((event->state & gtk_accelerator_get_default_mod_mask ()) ==
+          (mods & gtk_accelerator_get_default_mod_mask ())))
         {
           GtkMenuBar *menubar;
           GtkMenuShell *menushell;